Was this defconfig updated with make savedefconfig?

yes, this is what I obtained:

kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ ARCH=arm make nati_slsc_defconfig
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/kconfig/conf.o
  HOSTCC  scripts/kconfig/confdata.o
  HOSTCC  scripts/kconfig/expr.o
  LEX     scripts/kconfig/lexer.lex.c
  YACC    scripts/kconfig/parser.tab.[ch]
  HOSTCC  scripts/kconfig/lexer.lex.o
  HOSTCC  scripts/kconfig/menu.o
  HOSTCC  scripts/kconfig/parser.tab.o
  HOSTCC  scripts/kconfig/preprocess.o
  HOSTCC  scripts/kconfig/symbol.o
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ cat .config | grep CONFIG_LOCALVERSION
CONFIG_LOCALVERSION="-ni"
CONFIG_LOCALVERSION_AUTO=y
kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ make savedefconfig
kaewoei@my-pen-rd22:~/dev/kernel/fork/linux$ cat defconfig | grep CONFIG_LOCALVERSION
CONFIG_LOCALVERSION="-ni"

I made the comment on the 1st line of this file not necessarily because of any issue with CONFIG_LOCALVERSION.. but generally for the whole file (because GitHub doesn't allow comments on whole file).

The defconfig generated after ARCH=arm make nati_slsc_defconfig && ARCH=arm make savedefconfig should be the same as nati_slsc_defconfig (e.g., this is the check we have for nati_x86_64_defconfig).
I ran the commands locally and see that that's not the case here. Please update nati_slsc_defconfig.

You may also want to update the commit message to say that it was regenerated. E.g., dca8306.

I see that you've more commits you want to cherry-pick that'll change this defconfig. So I'm also ok with doing the defconfig regeneration in that other PR.

I got what you mean, also observed bluefin has made changes in commit d3db949. OK, I will do the defconfig regeneration after complete cherry picking the remaining defconfig changes from kernel 4.1.